Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2012 03:04:26 +0000 (19:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2012 03:04:26 +0000 (19:04 -0800)
commitde37c083c2d156f801092ba88d3ea664a62b96fc
tree4e45ef585358f8c852395b1bd15ed16ecefc7194
parent5e2b206c2b406fd888e22031f4e064e8375a43be
parent015cd01274d62fbe5d82a2c8cb23511081fcc5b8
Merge from trunk.